WInPhone Fixes 2