Minor Bootstrap changes #2