Warnings clean up

BugzID: 40111