some more interceptor updates