Fix methods to allow static calling