Corrections due to changes to mirrors and noSuchMethod()