Fixes inheritance problems