Fixes statement refs.
Merge pull request #454 from LearningLocker/issue/conformance-ryan2

Fixes statement refs.