Import / Export fixes