More fixes for rustc, maybe