Rustc fixes

Get it building again.