AROMA: Fix several stuff