Bug fixes for doubles in conditionals