More linting warnings and a small bug fix.
More linting.