[OneFichierCom] Fixed wait pattern + code optimizations