various small cleanups