fix log messages in CHECK
Merge branch 'master' into ports