More lock tuning