More corrections suggested by hlint