Pre-merge tweaks for #37