Fix errors to compile under rustc 0.11