Data download fixes