Fix for externfn changes