State transition fixes.