Latest tweaks for multisheet exports