more changes for latency hint compatibility with latest code