Various cleanup, thanks to Gunnar Morling
Add dropped restriction back to interceptors
Typo, thanks to George Gastaldi