fixes for latest rustc