Flag and stance buttons fixes