Some little cleanups