Fixed build with latest zinc/rustc