More flax work/fixes