minor fixes and cleanups