Fixing leftover changes from HooksApi