Another round of bug fixes...