handful of bug fixes