Fix unwrap deprecation warnings.