More aroma fixes by @mrtur