Inheritance fixes