Moar fixing of interceptors (turned it off for now)