Fixing broken stuff.