Resolved all compilation errors