HichemTab-tech some fixes