Enabled some optims