Fixes for WP8

fixes for WP8