Fixing a lot of stuff