Fix conditional expressions