Fixing things I screwed up