Lint fixes plus other fixes and cleanup needed to enable a build to work.