Modify CLI behavior slightly