Working on DOM-Calvin's fixes