Merge "Fix minor problems with interface verification and default methods."