Further tweaks for #2048
Fixes for #2023