The Labyrinth: Some lags fixes

Some lags fixes