Fixes to address we7 specific warnings
Merge pull request #100 from sas71/fix-we7-warnings

Fixes to address we7 specific warnings