Attempting to fix again
More fixes