fixes from closure linter