Various AR fixes
Merge pull request #26 from delphiactual/master

Various AR fixes