More state execution order fixes