Fixing up strangely broken stuff