Fix bugs in dual button config