- [all] minor fixes from code-review