More compile error fixes.