Fixed some inheritance