Minor fixes to enable standalone CLI usage in global install