Fix for extern fn changes