Some bug fixes reported by testers