Expander tweaks