diff --git a/common/pybindings.cc b/common/pybindings.cc
index 83043da1..13e0976c 100644
--- a/common/pybindings.cc
+++ b/common/pybindings.cc
@@ -96,7 +96,7 @@ BOOST_PYTHON_MODULE(MODULE_NAME)
             .def_readwrite("net", &PortInfo::net)
             .def_readwrite("type", &PortInfo::type);
 
-    class_<CellInfo, CellInfo *, boost::noncopyable>("CellInfo")
+    class_<CellInfo, CellInfo *>("CellInfo")
             .def_readwrite("name", &CellInfo::name)
             .def_readwrite("type", &CellInfo::type)
             .def_readwrite("ports", &CellInfo::ports)
@@ -110,7 +110,7 @@ BOOST_PYTHON_MODULE(MODULE_NAME)
 
     class_<BaseCtx, BaseCtx *, boost::noncopyable>("BaseCtx", no_init)
             .add_property("nets", make_getter(&Context::nets, return_internal_reference<>()))
-            .add_property("cells", make_getter(&Context::nets, return_internal_reference<>()));
+            .add_property("cells", make_getter(&Context::cells, return_internal_reference<>()));
 
     WRAP_MAP_UPTR(decltype(Context::nets), "IdNetMap");
     WRAP_MAP_UPTR(decltype(Context::cells), "IdCellMap");
diff --git a/common/pycontainers.h b/common/pycontainers.h
index 01145ea7..917f49e9 100644
--- a/common/pycontainers.h
+++ b/common/pycontainers.h
@@ -341,7 +341,7 @@ template <typename T> struct map_wrapper_uptr
     static void wrap(const char *map_name, const char *kv_name, const char *kv_iter_name, const char *iter_name)
     {
         map_pair_wrapper_uptr<typename KV::first_type, typename KV::second_type>::wrap(kv_name, kv_iter_name);
-        typedef range_wrapper<T, return_value_policy<copy_non_const_reference>> rw;
+        typedef range_wrapper<T, return_internal_reference<>> rw;
         typename rw::iter_wrap().wrap(iter_name);
         class_<T, boost::noncopyable>(map_name, no_init)
                 .def("__iter__", rw::iter)