Fixing up things I broke