cleaning up some issues from bootstrap update