Small fixes on if_else