Began to fix the weird stuff that happened when Rare merged