fixes for laps mode