More Bootstrap Updates