fix build failure issues