Updates for new bootstrap version