Fix a few more 0/1 False/True discrepencies