Fix a couple of helpop issues

Fixes issue #949 reported by @webczat