Small post-merge fixes