Further little bootstrap updates.