Round of bug fixes