Fix resolution of func types