WFK2-634 and WFK2-638

Multiple fixes. Mostly relevant for Cordova quickstarts.