diff --git a/src/dvec.rs b/src/dvec.rs
index 579dcd4f..24a14676 100644
--- a/src/dvec.rs
+++ b/src/dvec.rs
@@ -48,7 +48,7 @@ impl<N> IterableMut<N> for DVec<N>
 
 impl<N, Iter: Iterator<N>> FromIterator<N, Iter> for DVec<N>
 {
-  fn from_iterator(param: &mut Iter) -> DVec<N>
+  fn from_iterator(mut param: &mut Iter) -> DVec<N>
   {
     let mut res = DVec { at: ~[] };
 
diff --git a/src/tests/mat.rs b/src/tests/mat.rs
index fae11d1f..fa5d5648 100644
--- a/src/tests/mat.rs
+++ b/src/tests/mat.rs
@@ -25,7 +25,7 @@ use adaptors::rotmat::Rotmat;
 
 macro_rules! test_inv_mat_impl(
   ($t: ty) => (
-    for 10000.times
+    do 10000.times
     {
       let randmat : $t = random();
 
@@ -36,7 +36,7 @@ macro_rules! test_inv_mat_impl(
 
 macro_rules! test_transpose_mat_impl(
   ($t: ty) => (
-    for 10000.times
+    do 10000.times
     {
       let randmat : $t = random();
 
@@ -96,7 +96,7 @@ fn test_inv_mat6()
 #[test]
 fn test_rotation2()
 {
-  for 10000.times
+  do 10000.times
   {
     let randmat = One::one::<Rotmat<Mat2<f64>>>();
     let ang     = &Vec1::new(abs::<f64>(random()) % Real::pi());
@@ -116,7 +116,7 @@ fn test_index_mat2()
 #[test]
 fn test_inv_rotation3()
 {
-  for 10000.times
+  do 10000.times
   {
     let randmat        = One::one::<Rotmat<Mat3<f64>>>();
     let dir: Vec3<f64> = random();
diff --git a/src/tests/vec.rs b/src/tests/vec.rs
index 34a944ca..cd064a03 100644
--- a/src/tests/vec.rs
+++ b/src/tests/vec.rs
@@ -23,7 +23,7 @@ use traits::scalar_op::{ScalarMul, ScalarDiv, ScalarAdd, ScalarSub};
 
 macro_rules! test_iterator_impl(
   ($t: ty, $n: ty) => (
-    for 10000.times
+    do 10000.times
     {
       let v: $t      = random();
       let mut mv: $t = v.clone();
@@ -41,7 +41,7 @@ macro_rules! test_iterator_impl(
 
 macro_rules! test_commut_dot_impl(
   ($t: ty) => (
-    for 10000.times
+    do 10000.times
     {
       let v1 : $t = random();
       let v2 : $t = random();
@@ -53,7 +53,7 @@ macro_rules! test_commut_dot_impl(
 
 macro_rules! test_scalar_op_impl(
   ($t: ty, $n: ty) => (
-    for 10000.times
+    do 10000.times
     {
       let v1 : $t = random();
       let n  : $n = random();
@@ -77,7 +77,7 @@ macro_rules! test_scalar_op_impl(
 
 macro_rules! test_basis_impl(
   ($t: ty) => (
-    for 10000.times
+    do 10000.times
     {
       do Basis::canonical_basis::<$t> |e1|
       {
@@ -92,7 +92,7 @@ macro_rules! test_basis_impl(
 
 macro_rules! test_subspace_basis_impl(
   ($t: ty) => (
-    for 10000.times
+    do 10000.times
     {
       let v : $t   = random();
       let v1       = v.normalized();
@@ -114,7 +114,7 @@ macro_rules! test_subspace_basis_impl(
 #[test]
 fn test_cross_vec3()
 {
-  for 10000.times
+  do 10000.times
   {
     let v1 : Vec3<f64> = random();
     let v2 : Vec3<f64> = random();
diff --git a/src/vec.rs b/src/vec.rs
index f3160a83..1cb3336c 100644
--- a/src/vec.rs
+++ b/src/vec.rs
@@ -2,7 +2,7 @@ use std::cast;
 use std::num::{Zero, One, Algebraic, Bounded};
 use std::rand::Rng;
 use std::vec::{VecIterator, VecMutIterator};
-use std::iterator::{Iterator, IteratorUtil, FromIterator};
+use std::iterator::{Iterator, FromIterator};
 use std::cmp::ApproxEq;
 use std::uint::iterate;
 use traits::basis::Basis;