Bootstrap fix

See commit messages.