[NDCPortable] more VB fixes