Fix If and While statements