Export fixes