Fixes for FnCallFold