more fixes for new boolean logic.