Set of bug fixes

Number of bug fixes