Export format fixes