fixing stuff for CLI
That's annoying