trying to fix build failure issues;