Fixed issues related to the WP8.1 version