Fixes to morea-install and morea-merge-upstream