Property inheritance fixes