Bootstrap related fixes.
Merge pull request #1029 from cmfcmf/bootstrap-fixes

Bootstrap related fixes.