various tweaks to make everything export once