Fixes to address we7 specific warnings