Fixes in the interceptor