Fixes some parts of the state feature.
Merge pull request #460 from LearningLocker/issue/conformance-ryan2

Fixes some parts of the state feature.