Fixed minor bugs introduced with recent ARP Engine refactorings. Thanks to Will...