Command path fixes