Bugfixes dw

Addresses the following jira stories:

https://jira.library.nd.edu/browse/DLTP-52
https://jira.library.nd.edu/browse/DLTP-147