Bold fixes part 3