Fixes for Downloads and Debug