build fixes for WP80.  some stuff in previous commit was busted.