Fixes to the lags