Fixed inheritance stuff