Fix bungs with WP8