Fixed some conditional expressions