More compilation errors fixed.