Prevent duplicate data conversion in the 2.0.1 migration
Fixed download expiration calculation (#932)