Now fix all compilation errors