Miscellaneous clean up