A large number of bug fixes