Fix Freeze/Thaw options to be consistent
Do not optimize analytics_session