Fixes for last rustc