more fixes for lag compensation