Lint and QA tweaks.