Fixing up a little