Bootstrap fixes

Minor fixes