Fix breaking changes from cli flags