Some ARS bugs fixed