Removing some calls to unwrap