small cleanups etc.