Large number of bug fixes