fixes for sbs lock/unlock behavior