Fixing up bug changes from original bootstrap repo.