Fixed a couple of bugs around single function interceptors