Addressed code warnings

Addressed code warnings