Boolean fixes