Fixing the things I broke