Fix things up!