Other updates for bootstrap