Fix compile error due to changes to rustc