diff --git a/includes/class-wc-download-handler.php b/includes/class-wc-download-handler.php
index fb8cb9ce408..7e34decb39b 100644
--- a/includes/class-wc-download-handler.php
+++ b/includes/class-wc-download-handler.php
@@ -21,7 +21,7 @@ class WC_Download_Handler {
 	 * Hook in methods.
 	 */
 	public static function init() {
-		if ( isset( $_GET['download_file'] ) && isset( $_GET['order'] ) && isset( $_GET['email'] ) ) {
+		if ( isset( $_GET['download_file'], $_GET['order'], $_GET['email'] ) ) {
 			add_action( 'init', array( __CLASS__, 'download_product' ) );
 		}
 		add_action( 'woocommerce_download_file_redirect', array( __CLASS__, 'download_file_redirect' ), 10, 2 );
@@ -74,8 +74,8 @@ class WC_Download_Handler {
 		);
 		$count     = $download->get_download_count();
 		$remaining = $download->get_downloads_remaining();
-		$download->set_download_count( $count ++ );
-		$download->set_downloads_remaining( $remaining -- );
+		$download->set_download_count( $count + 1 );
+		$download->set_downloads_remaining( $remaining - 1 );
 		$download->save();
 
 		self::download( $product->get_file_download_path( $download->get_download_id() ), $download->get_product_id() );
diff --git a/includes/data-stores/class-wc-customer-download-data-store.php b/includes/data-stores/class-wc-customer-download-data-store.php
index f81eab879ca..4c5ff2e1e30 100644
--- a/includes/data-stores/class-wc-customer-download-data-store.php
+++ b/includes/data-stores/class-wc-customer-download-data-store.php
@@ -21,16 +21,16 @@ class WC_Customer_Download_Data_Store implements WC_Customer_Download_Data_Store
 		global $wpdb;
 
 		$data = array(
-			'download_id'         => $download->get_download_id(),
-			'product_id'          => $download->get_product_id(),
-			'user_id'             => $download->get_user_id(),
-			'user_email'          => $download->get_user_email(),
-			'order_id'            => $download->get_order_id(),
-			'order_key'           => $download->get_order_key(),
-			'downloads_remaining' => $download->get_downloads_remaining(),
-			'access_granted'      => date( 'Y-m-d', $download->get_access_granted() ),
-			'download_count'      => $download->get_download_count(),
-			'access_expires'      => $download->get_access_expires() ? date( 'Y-m-d', $download->get_access_expires() ) : null,
+			'download_id'         => $download->get_download_id( 'edit' ),
+			'product_id'          => $download->get_product_id( 'edit' ),
+			'user_id'             => $download->get_user_id( 'edit' ),
+			'user_email'          => $download->get_user_email( 'edit' ),
+			'order_id'            => $download->get_order_id( 'edit' ),
+			'order_key'           => $download->get_order_key( 'edit' ),
+			'downloads_remaining' => $download->get_downloads_remaining( 'edit' ),
+			'access_granted'      => date( 'Y-m-d', $download->get_access_granted( 'edit' ) ),
+			'download_count'      => $download->get_download_count( 'edit' ),
+			'access_expires'      => $download->get_access_expires( 'edit' ) ? date( 'Y-m-d', $download->get_access_expires( 'edit' ) ) : null,
 		);
 
 		$format = array(
@@ -87,16 +87,16 @@ class WC_Customer_Download_Data_Store implements WC_Customer_Download_Data_Store
 		global $wpdb;
 
 		$data = array(
-			'download_id'         => $download->get_download_id(),
-			'product_id'          => $download->get_product_id(),
-			'user_id'             => $download->get_user_id(),
-			'user_email'          => $download->get_user_email(),
-			'order_id'            => $download->get_order_id(),
-			'order_key'           => $download->get_order_key(),
-			'downloads_remaining' => $download->get_downloads_remaining(),
-			'access_granted'      => date( 'Y-m-d', $download->get_access_granted() ),
-			'download_count'      => $download->get_download_count(),
-			'access_expires'      => $download->get_access_expires() ? date( 'Y-m-d', $download->get_access_expires() ) : null,
+			'download_id'         => $download->get_download_id( 'edit' ),
+			'product_id'          => $download->get_product_id( 'edit' ),
+			'user_id'             => $download->get_user_id( 'edit' ),
+			'user_email'          => $download->get_user_email( 'edit' ),
+			'order_id'            => $download->get_order_id( 'edit' ),
+			'order_key'           => $download->get_order_key( 'edit' ),
+			'downloads_remaining' => $download->get_downloads_remaining( 'edit' ),
+			'access_granted'      => date( 'Y-m-d', $download->get_access_granted( 'edit' ) ),
+			'download_count'      => $download->get_download_count( 'edit' ),
+			'access_expires'      => $download->get_access_expires( 'edit' ) ? date( 'Y-m-d', $download->get_access_expires( 'edit' ) ) : null,
 		);
 
 		$format = array(