fixes for exchange to work with armory offline