@@ -10,6 +10,12 @@ What's New in Stackless 2.7.XX?
 
 *Release date: XXXX-XX-XX*
 
+- https://github.com/stackless-dev/stackless/issues/140
+  Fix bugs in prickelpit.c slp_find_execname().
+
+- https://github.com/stackless-dev/stackless/issues/138
+  Correctly propose Stackless calls for C-functions.
+
 - https://github.com/stackless-dev/stackless/issues/135
   Fix small memory leaks for types with Stackless extensions.
 
 
@@ -676,11 +676,23 @@ do { \
 } while(0)
 
 /* ditto, without incref. Made no sense to optimize. */
+#if defined(__GNUC__) && defined(__STDC__) && (__STDC_VERSION__ >= 199901L)
+#define SLP_DISABLE_GCC_W_ADDRESS \
+	    _Pragma("GCC diagnostic push") \
+	    _Pragma("GCC diagnostic ignored \"-Waddress\"")
+#define SLP_RESTORE_WARNINGS \
+	    _Pragma("GCC diagnostic pop")
+#else
+#define SLP_DISABLE_GCC_W_ADDRESS /**/
+#define SLP_RESTORE_WARNINGS /**/
+#endif
 
 #define TASKLET_SETVAL_OWN(task, val) \
 do { \
     PyObject *hold = (task)->tempval; \
+    SLP_DISABLE_GCC_W_ADDRESS /* suppress warning, if val == Py_NONE */ \
     assert(val != NULL); \
+    SLP_RESTORE_WARNINGS \
     (task)->tempval = (PyObject *) val; \
     Py_DECREF(hold); \
 } while(0)
 
@@ -410,6 +410,8 @@ slp_find_execname(PyFrameObject *f, int *valid)
     PyObject *dic = dp ? dp->dict : NULL;
     PyObject *exec_addr = PyLong_FromVoidPtr(f->f_execute);
 
+    assert(valid != NULL);
+
     if (exec_addr == NULL) return NULL;
     exec_name = dic ? PyDict_GetItem(dic, exec_addr) : NULL;
     if (exec_name == NULL) {
@@ -418,7 +420,7 @@ slp_find_execname(PyFrameObject *f, int *valid)
         sprintf(msg, "frame exec function at %p is not registered!",
             (void *)f->f_execute);
         PyErr_SetString(PyExc_ValueError, msg);
-        valid = 0;
+        *valid = 0;
     }
     else {
         PyFrame_ExecFunc *good, *bad;
@@ -427,7 +429,7 @@ slp_find_execname(PyFrameObject *f, int *valid)
             goto err_exit;
         }
         if (f->f_execute == bad)
-            valid = 0;
+            *valid = 0;
         else if (f->f_execute != good) {
             PyErr_SetString(PyExc_SystemError,
                 "inconsistent c?frame function registration");