Minor change to some conditionals