Fix things up a bit