some more fixes from hlint suggestions