Compile fixes (round 1)