Fix errors reported by Cpplint.py