misc export fixes