Fixed issues with item inheritence