Fixes on the cli