Fixing up a bunch of stuff