Bug fixes from AROPA