Clean up a few of the loose ends