More Aside fixes