Misc aroma fixes