More fixes in osis blob logic