Joined inheritance fixes