Trying to fix some terrible things