More inheritance schema corrections