Fixes for study-download options and waiver/license UI

See commit messages for details.