minor fixes/improvements (Lint)