more inheritance fixes