A few little cleanups