Fixed issues with migration of non-consumables