diff --git a/qucs/components/bjtsub.cpp b/qucs/components/bjtsub.cpp
index cdc51745..e6ab22ea 100644
--- a/qucs/components/bjtsub.cpp
+++ b/qucs/components/bjtsub.cpp
@@ -128,7 +128,7 @@ Basic_BJT::Basic_BJT()
 BJTsub::BJTsub()
 {
   Description = QObject::tr("bipolar junction transistor with substrate");
-  Simulator = spicecompat::simQucsator;
+  Simulator = spicecompat::simAll;
   createSymbol();
   tx = x2+4;
   ty = y1+4;
diff --git a/qucs/components/componentdialog.cpp b/qucs/components/componentdialog.cpp
index 68b9069e..8e585db0 100644
--- a/qucs/components/componentdialog.cpp
+++ b/qucs/components/componentdialog.cpp
@@ -422,7 +422,7 @@ ComponentDialog::ComponentDialog(Component *c, Schematic *d)
   connect(ButtDown, SIGNAL(clicked()), SLOT(slotButtDown()));
 
   QStringList allowedFillFromSPICE;
-  allowedFillFromSPICE<<"_BJT"<<"JFET"<<"MOSFET"<<"_MOSFET"<<"Diode";
+  allowedFillFromSPICE<<"_BJT"<<"JFET"<<"MOSFET"<<"_MOSFET"<<"Diode"<<"BJT";
   ButtFillFromSpice = new QPushButton(tr("Fill from SPICE .MODEL"));
   if (!allowedFillFromSPICE.contains(Comp->Model)) {
     ButtFillFromSpice->setEnabled(false);
diff --git a/qucs/components/diode.cpp b/qucs/components/diode.cpp
index 5dda286a..a29c4976 100644
--- a/qucs/components/diode.cpp
+++ b/qucs/components/diode.cpp
@@ -119,7 +119,7 @@ QString Diode::spice_netlist(bool isXyce)
                      <<"Nr"<<"Ffe"<<"Temp"<<"Area"<<"Symbol"<<"UseGlobTemp"; // spice-incompatible parameters
     } else {
         spice_tr<<"Tbv"<<"Tcv";
-        spice_incompat<<"Cp"<<"Isr"<<"Nr"<<"Ffe"<<"Temp"<<"Area"<<"Symbol"<<"UseGLobTemp";
+        spice_incompat<<"Cp"<<"Isr"<<"Nr"<<"Ffe"<<"Temp"<<"Area"<<"Symbol"<<"UseGlobTemp";
     }
 
     QString par_str;