More tweaks (retro)