diff --git a/rust-hl-lua/src/functions_write.rs b/rust-hl-lua/src/functions_write.rs
index db71a6e..abda3b7 100644
--- a/rust-hl-lua/src/functions_write.rs
+++ b/rust-hl-lua/src/functions_write.rs
@@ -126,14 +126,14 @@ macro_rules! Push_function(
             }
         }
     );
-)
+);
 
-Push_function!(self, args, { (*self)() } | )
-Push_function!(self, args, { (*self)(args) } | Arg1 )
-Push_function!(self, args, { (*self)(args.ref0().clone(), args.ref1().clone()) } | Arg1, Arg2 )
-Push_function!(self, args, { (*self)(args.ref0().clone(), args.ref1().clone(), args.ref2().clone()) } | Arg1, Arg2, Arg3 )
-Push_function!(self, args, { (*self)(args.ref0().clone(), args.ref1().clone(), args.ref2().clone(), args.ref3().clone()) } | Arg1, Arg2, Arg3, Arg4 )
-Push_function!(self, args, { (*self)(args.ref0().clone(), args.ref1().clone(), args.ref2().clone(), args.ref3().clone(), args.ref4().clone()) } | Arg1, Arg2, Arg3, Arg4, Arg5 )
+Push_function!(self, args, { (*self)() } | );
+Push_function!(self, args, { (*self)(args) } | Arg1 );
+Push_function!(self, args, { (*self)(args.ref0().clone(), args.ref1().clone()) } | Arg1, Arg2 );
+Push_function!(self, args, { (*self)(args.ref0().clone(), args.ref1().clone(), args.ref2().clone()) } | Arg1, Arg2, Arg3 );
+Push_function!(self, args, { (*self)(args.ref0().clone(), args.ref1().clone(), args.ref2().clone(), args.ref3().clone()) } | Arg1, Arg2, Arg3, Arg4 );
+Push_function!(self, args, { (*self)(args.ref0().clone(), args.ref1().clone(), args.ref2().clone(), args.ref3().clone(), args.ref4().clone()) } | Arg1, Arg2, Arg3, Arg4, Arg5 );
 // TODO: finish
 
 
diff --git a/rust-hl-lua/src/rust_tables.rs b/rust-hl-lua/src/rust_tables.rs
index 03cd5d3..4111c7d 100644
--- a/rust-hl-lua/src/rust_tables.rs
+++ b/rust-hl-lua/src/rust_tables.rs
@@ -3,7 +3,7 @@ use super::Push;
 use HasLua;
 
 use std::collections::{HashMap, HashSet};
-use collections::hash::Hash;
+use std::hash::Hash;
 
 fn push_iter<L: HasLua, V: Push<L>, I: Iterator<V>>(lua: &mut L, iterator: I) -> uint {
     // creating empty table
diff --git a/rust-hl-lua/src/tuples.rs b/rust-hl-lua/src/tuples.rs
index 7305770..b986cad 100644
--- a/rust-hl-lua/src/tuples.rs
+++ b/rust-hl-lua/src/tuples.rs
@@ -34,16 +34,16 @@ macro_rules! tuple_impl(
             }
         }
     );
-)
+);
 
-tuple_impl!(A | ref0, B | ref1)
-tuple_impl!(A | ref0, B | ref1, C | ref2)
-tuple_impl!(A | ref0, B | ref1, C | ref2, D | ref3)
-tuple_impl!(A | ref0, B | ref1, C | ref2, D | ref3, E | ref4)
-tuple_impl!(A | ref0, B | ref1, C | ref2, D | ref3, E | ref4, F | ref5)
-tuple_impl!(A | ref0, B | ref1, C | ref2, D | ref3, E | ref4, F | ref5, G | ref6)
-tuple_impl!(A | ref0, B | ref1, C | ref2, D | ref3, E | ref4, F | ref5, G | ref6, H | ref7)
-tuple_impl!(A | ref0, B | ref1, C | ref2, D | ref3, E | ref4, F | ref5, G | ref6, H | ref7, I | ref8)
-tuple_impl!(A | ref0, B | ref1, C | ref2, D | ref3, E | ref4, F | ref5, G | ref6, H | ref7, I | ref8, J | ref9)
-tuple_impl!(A | ref0, B | ref1, C | ref2, D | ref3, E | ref4, F | ref5, G | ref6, H | ref7, I | ref8, J | ref9, K | ref10)
-tuple_impl!(A | ref0, B | ref1, C | ref2, D | ref3, E | ref4, F | ref5, G | ref6, H | ref7, I | ref8, J | ref9, K | ref10, L | ref11)
+tuple_impl!(A | ref0, B | ref1);
+tuple_impl!(A | ref0, B | ref1, C | ref2);
+tuple_impl!(A | ref0, B | ref1, C | ref2, D | ref3);
+tuple_impl!(A | ref0, B | ref1, C | ref2, D | ref3, E | ref4);
+tuple_impl!(A | ref0, B | ref1, C | ref2, D | ref3, E | ref4, F | ref5);
+tuple_impl!(A | ref0, B | ref1, C | ref2, D | ref3, E | ref4, F | ref5, G | ref6);
+tuple_impl!(A | ref0, B | ref1, C | ref2, D | ref3, E | ref4, F | ref5, G | ref6, H | ref7);
+tuple_impl!(A | ref0, B | ref1, C | ref2, D | ref3, E | ref4, F | ref5, G | ref6, H | ref7, I | ref8);
+tuple_impl!(A | ref0, B | ref1, C | ref2, D | ref3, E | ref4, F | ref5, G | ref6, H | ref7, I | ref8, J | ref9);
+tuple_impl!(A | ref0, B | ref1, C | ref2, D | ref3, E | ref4, F | ref5, G | ref6, H | ref7, I | ref8, J | ref9, K | ref10);
+tuple_impl!(A | ref0, B | ref1, C | ref2, D | ref3, E | ref4, F | ref5, G | ref6, H | ref7, I | ref8, J | ref9, K | ref10, L | ref11);
diff --git a/rust-hl-lua/src/values.rs b/rust-hl-lua/src/values.rs
index a9e4393..b33263a 100644
--- a/rust-hl-lua/src/values.rs
+++ b/rust-hl-lua/src/values.rs
@@ -35,12 +35,12 @@ macro_rules! integer_impl(
         impl<L: HasLua> Index<L> for $t {
         }
     );
-)
+);
 
-integer_impl!(int)
-integer_impl!(i8)
-integer_impl!(i16)
-integer_impl!(i32)
+integer_impl!(int);
+integer_impl!(i8);
+integer_impl!(i16);
+integer_impl!(i32);
 //integer_impl!(i64)   // data loss
 
 macro_rules! unsigned_impl(
@@ -72,13 +72,13 @@ macro_rules! unsigned_impl(
         impl<L: HasLua> Index<L> for $t {
         }
     );
-)
+);
 
-unsigned_impl!(uint)
-unsigned_impl!(u8)
-unsigned_impl!(u16)
-unsigned_impl!(u32)
-//unsigned_impl!(u64)   // data loss
+unsigned_impl!(uint);
+unsigned_impl!(u8);
+unsigned_impl!(u16);
+unsigned_impl!(u32);
+//unsigned_impl!(u64);   // data loss
 
 macro_rules! numeric_impl(
     ($t:ident) => (
@@ -109,10 +109,10 @@ macro_rules! numeric_impl(
         impl<L: HasLua> Index<L> for $t {
         }
     );
-)
+);
 
-numeric_impl!(f32)
-numeric_impl!(f64)
+numeric_impl!(f32);
+numeric_impl!(f64);
 
 impl<L: HasLua> Push<L> for String {
     fn push_to_lua(self, lua: &mut L) -> uint {