Fix compilation after removal of optimizer