More conditional fixes for if statements inside of if statements