new changes to fix cibuild error

sorry, but hope these are the last changes to fix the cibuild & other errors