WP8 fixes