Removed all compilation errors