Patch to fix svm_cli compilation error under core.109.xx.xx.

Added a second patch to fix another error.