Fixing up a few things