fix some conditionals