some fixes with inheritance