Revert changes done on last update of ol and fix events conflict on win surface