Fixing a lot of things