More WP8 fixes