Fixups from hlint