Update bootstrap and minor fixes