Yet more conditionals fixes