Added additional lock reset and additional logging