Made some other changes to fix crashing on gen estimate in summary page