Fix inherit management