Remove warnings

Second part of the pull request #263 - sorry for inconvenience