Fixes due to the bug Model checker failing test #272.