Fix bugs in new arc code.