One more set of bug fixes