Post-merge fixes 2