Fex fixes in the expander