Fixed some inheritance issues