small fixes

* Cleaned up some import
* Fixed a small bug in UserDownloadChoice