Post-merge fixes