DSOS/SDSOS changes from Ani and bug fixes