Fix warnings. Set 2
Fix warnings. Set 3