Aroma misc fixes