Workarounds for some "partial state change" issues