Manual export fixes