Fixing broken stuff. Woops!