Fix estrict issues