Fixed issues with cordova plugins