Fixed: Compilation errors