Round of bug fixes.