Fixed inheritance issues