Bug fixes to how some of the internal state info is published via attributes.