fix stuffs to fit build requirement