Tweaks from PR #58