Fix signature, fix mertable pointer references