Repaired compilation errors