Fixed some sections that were breaking with optimization