More fixes to unhook behavior