More LINT and build fixes