WIP: Fixes for DataTransfer percentage Bugs