Fix some minor WP7 glitches