Some fixes for Bootstrap and more