minor changes to back port from forked scriblio on Pro

See https://github.com/GigaOM/legacy-pro/pull/552/files