Adjustments from arco ics-3.0 branch! (2)