Fixes for WP8 Template