Fixes for disclosure app.