Minor fixes for ARC