Adapt stricts warnings