Fix file, subscribers hooks