Add locks around window buckets