Lint fixes.
Minor fixes to use newly public attributes.