Attempting to fix issues
More issues