More bootstrap compatibility updates