Fix the last few compiler errors