Handful of bug fixes