Fixes to cordova