Fixes for new method handling.