Fixing a couple merge defects