Working on some CKEditor fixes