Misceallenous fixes for the Windows Phone 8 port