Respect new changes to the osf