Fixed a few relics of merges long past