more bool fixes