Address Xlint warnings
Merge pull request #1424 from maginatics/xlint

Address Xlint warnings