Fixes for WindowsPhone