Fixing a couple of merge problems.