Fix deprecation warnings related to stub
ERP-121 Finish up specs for CLI