Fix import / export