Matrix fixes for bootstraps with tf data