Fix some country codes and remove a trailing space