Mostly bootstrap modifications