Fixes for state debugging.