Bootstrap: several small fixes.