Fixes after code-review