Inheritance fixes for GUI