[NDCPortable] WinPhone and VB fixes