minor fixes/cleanups