Fixing things up a little