Added minor fixes and MultipleInheritanceTest.