Nightly fixes

Hi! I've made a couple updates to make the library compilable again under the current Rust master (`rustc 0.11.0-pre (6d8342f 2014-06-14 17:51:49 +0000)`)