After-merge fixes