bug fixes during hlint sat