updated fixes for ARC CE 4.0