fixes for new bootstrap