Fixing up some minor changes