Minor WP8 client clean-up