FIX: Broken CLI commands in remote controller mode