Index: /trunk/nv/array2d.hh
===================================================================
--- /trunk/nv/array2d.hh	(revision 140)
+++ /trunk/nv/array2d.hh	(revision 141)
@@ -172,5 +172,5 @@
 		inline const_reference operator[] ( const ivec2& c ) const 
 		{
-			NV_ASSERT( c.x >= 0 && c.y >= 0 && x < m_size.x && y < m_size.y, "Bad parameters passed to array2d[]" );
+			NV_ASSERT( c.x >= 0 && c.y >= 0 && c.x < m_size.x && c.y < m_size.y, "Bad parameters passed to array2d[]" );
 			return m_data[ c.y * m_size.x + c.x ];
 		}
Index: /trunk/nv/interface/mesh.hh
===================================================================
--- /trunk/nv/interface/mesh.hh	(revision 140)
+++ /trunk/nv/interface/mesh.hh	(revision 141)
@@ -94,5 +94,5 @@
 		{
 			map::iterator i = m_map.find( attr );
-			if ( i != m_map.end() && i->second->get_type() != type_to_enum<T>() ) 
+			if ( i != m_map.end() && i->second->get_type() != type_to_enum<T>::type ) 
 			{
 				return ((vertex_attribute<T>*)(i->second));