fixes to hooks