Fixed bugs in ARS, etc