Multiple fixes including ACE editor