Fix

Another round of quick and hopefully not dangerous stuff.