post-merge fixes