few more fixes/cleanups