Fix disabling commands