Fix some bugs with the interceptors.