Clean-up and minor fixes after PR #8