Changes to make lint happy

I know these are trivial changes, but needed for internal repos. Thought I would pass them upstream.