Issues/370

Fixes for https://github.com/freedomofpress/securedrop/issues/370