More bolding fixes