Fixing a few merge issues