Clean up a few more things