Tweaks from code-review