Tweaks from issue #3