Attempting to fix various things