Fixed to handle 9.3 API change (hook signature changed) and other bitrot (header files etc.)