Fixing up the Aroma build. More to come.