Fixes for codemirror v3

Fixes for codemirror v3