MISC: Aroma 2.0.1 early fixes