Improve lag compensation support