More codemirror fixes