Fixed service loading issues around audit hooks