Shell/3909

Fixes from QA
[endlessm/eos-shell#3909]