Multifixes for #761, #764 and #778
Changed the order of the method calls to how it is with vanilla tools.