minor changes to back port from forked scriblio on Pro

See https://github.com/GigaOM/legacy-pro/pull/552/files
a couple more back ports that may be needed
Merge pull request #17 from zbtirrell/backport-pro

minor changes to back port from forked scriblio on Pro