Wp8 fixes