Add lock and lock_id accessors
Fix lock accessors