fixes following on remarks by @betehess on PR #141