Fixing some old troublespots