All kinds of small cleanups