#291: some bootstrap fixes.