WInPhone Fixes