Fix signature wrappers