fixed some inheritance issues