Cleanups and fix of merge issues