fixes for ISAN, DOI