Fixes for CKEditor and UploadField
Code clean