Fix noSuchMethod calls