Fix ostf dependencies