A few little fixes

All this else if are useless since they all return