WP8 fixes for recent commits to V3

This pull request fixes the WP8 build broken by recent commits to the V3 branch.