Lock problems resolved