Small tweaks and fixes to baseline bootstrapping.