More lock management changes