Fixing a couple issues with merge