Fix wastepoint uploading