Fixes for latest rustc