Fixing a few things I broke