Some if/else syntax fixes