Sort bug fixes