fixes for ARC