Last little cleanups