More tweaks for #1379