Merge pull request #3317 from mrunge/check_fixes