Fixes from code-review