Fixed some errors from rustc.

Still not passing rustc though.