Misc rustc fixes