Fix the build
Fix errors found by the latest cpplint