Various AR fixes