Clean up some minor post-merge oddities