Several bug fixes from the Sanofi version (including TMART-228 + unreported bugs)