More corrections with issue #4