Further improved WP8 support, satisfied now