Made the product changes to fix the link errors