CGIV-1013: Using the full path for the commands