Inheritance modifier fixes