Fixed inheritance issues.