Fix linux build.
Merge branch 'sp-commandline'