Cleanup merge issues from upstream