Fix old Wrap methods.