Some export fixes