Maint/master/fixes after reorg