PR #655 - Add some improvements as in PR #636 (Grizzly)