fixes from code-review