Fixup the method calls used