Fix path issue. Lint fixes.
Lint fixes