Tweaks according to PR121 comments