Fix things up