More tweaks #831