Fix the things that got merged out