Fix bogus method descriptors, pass some parameters that got missed