Multiple bool => boolean fixes