Fix a couple of bugs after adding logic to re-tick after setting accumulate/composite