More fixes for expected and committed properties

Meh