Fixing things that got turned off overzealously