Fix some lags