Multi-instance command fixes.