State repro bugs fixed