Bool model fixes

It looks like this was written in a hurry. ;-)