Fix Spout commands