Fixing a bunch of stuff