Fixes inheritance, instance/class conversion