Some more fixes necessary for fixing issue with purchase_date.