Few little cleanups.