Misc interceptor improvements, also allowing offline run