Fixing a few bad code merges.