Added some missing stae-machine control variables.