Fix up some more hlint errors