WP7 fixes