Fix the compile failures from last night.