Fixing things up a bit