A few post-merge cleanup items