Fixed Compilation errors