Fix ostf hanging issues

manually