Various updates

Fixes for hlint 1.9 and update various bounds.