Fixed signature errors, which came out now that the callback parameter is last in hooks