Fixed inheritance problems