Adaptative fixes