Fixed minor bugs in ARC handling.