fixes for rust 0.6