Fix build ota error
misc fix