A few condition fixes