Some LINT and build fixes