Changes to facilitate merge

Alex's PR cannot merge currently, these tweaks should help

Merging immediately