Fix expected and committed properties