Small fixes for patch logic. Removes dependency from non-master cordova-windows branch