Fixing all purchase functionality