diff --git a/devsupApp/src/dbrec.c b/devsupApp/src/dbrec.c
index 714d8f5..f7821b5 100644
--- a/devsupApp/src/dbrec.c
+++ b/devsupApp/src/dbrec.c
@@ -34,7 +34,6 @@ static PyObject* pyRecord_new(PyTypeObject *type, PyObject *args, PyObject *kws)
     self = (pyRecord*)type->tp_alloc(type, 0);
     if(self) {
         dbInitEntry(pdbbase, &self->entry);
-        self->ispyrec = isPyRecord(self->entry.precnode->precord);
     }
     return (PyObject*)self;
 }
@@ -49,6 +48,7 @@ static int pyRecord_Init(pyRecord *self, PyObject *args, PyObject *kws)
         PyErr_SetString(PyExc_ValueError, "No record by this name");
         return -1;
     }
+    self->ispyrec = isPyRecord(self->entry.precnode->precord);
     return 0;
 }
 
diff --git a/devsupApp/src/pyDevSup.dbd b/devsupApp/src/pyDevSup.dbd
index 55c274a..7ef60fd 100644
--- a/devsupApp/src/pyDevSup.dbd
+++ b/devsupApp/src/pyDevSup.dbd
@@ -9,3 +9,4 @@ device(ao, INST_IO, pydevsupCom, "Python Device")
 device(ai, INST_IO, pydevsupCom2, "Raw Python Device")
 device(ao, INST_IO, pydevsupCom2, "Raw Python Device")
 
+device(waveform, INST_IO, pydevsupCom, "Python Device")
diff --git a/python/devsup/db.py b/python/devsup/db.py
index 4d8f0ab..5821421 100644
--- a/python/devsup/db.py
+++ b/python/devsup/db.py
@@ -61,6 +61,7 @@ def processLink(name, lstr):
     Returns (callable, Record, "arg1 arg2")
     """
     rec = getRecord(name)
-    modname, args = lstr.split(None,1)
+    parts = lstr.split(None,1)
+    modname, args = parts[0], parts[1] if len(parts)>1 else None
     mod = __import__(modname)
     return rec, mod.build(rec, args)