AROMA/APPS: Various fixes and changes