Fixes needed b/c of Rustc changes.