Fixed issues with inventory