global: export fixes and couple changes