WAI 3.0
Fix warnings