Mostly fixes for exports