Fixing up a number of things