Fixing up more things