Fixing broken stuff so it is no longer broken