diff --git a/include/boost/python/detail/caller.hpp b/include/boost/python/detail/caller.hpp
index 2834d6da9..898be3832 100644
--- a/include/boost/python/detail/caller.hpp
+++ b/include/boost/python/detail/caller.hpp
@@ -263,7 +263,7 @@ struct caller_arity<N>
     };
 };
 
-
+# undef N
 
 #endif // BOOST_PP_IS_ITERATING 
 
diff --git a/include/boost/python/detail/signature.hpp b/include/boost/python/detail/signature.hpp
index 11268b92c..214b41464 100644
--- a/include/boost/python/detail/signature.hpp
+++ b/include/boost/python/detail/signature.hpp
@@ -101,6 +101,8 @@ struct signature_arity<N>
     };
 };
 
+# undef N
+
 #endif // BOOST_PP_IS_ITERATING 
 
 
diff --git a/include/boost/python/type_id.hpp b/include/boost/python/type_id.hpp
index 601601c31..849b77c2e 100644
--- a/include/boost/python/type_id.hpp
+++ b/include/boost/python/type_id.hpp
@@ -18,7 +18,7 @@
 
 #  ifndef BOOST_PYTHON_HAVE_GCC_CP_DEMANGLE
 #   if defined(__GNUC__)                                                \
-    && !defined(__EDG_VERSION__)
+    && (!defined(__EDG_VERSION__) || defined(__LCC__))
 #    define BOOST_PYTHON_HAVE_GCC_CP_DEMANGLE
 #   endif
 #  endif
diff --git a/src/numpy/ndarray.cpp b/src/numpy/ndarray.cpp
index af09ecc33..921775393 100644
--- a/src/numpy/ndarray.cpp
+++ b/src/numpy/ndarray.cpp
@@ -127,8 +127,8 @@ ndarray from_data_impl(void * data,
     (PyArray_NewFromDescr(&PyArray_Type,
 			  incref_dtype(dt),
 			  shape.size(),
-			  const_cast<Py_intptr_t*>(&shape.front()),
-			  const_cast<Py_intptr_t*>(&strides.front()),
+			  const_cast<Py_intptr_t*>(shape.data()),
+			  const_cast<Py_intptr_t*>(strides.data()),
 			  data,
 			  flags,
 			  NULL)));