fix a few generation and linting errors