Few tweaks for bootstrapping