Fixed all (known) inheritance problems