Fixed some conditionals