Hook and Locking Fixes