Minor command improvements
Added compatibilty check