more misc fixes
Merge pull request #272 from CounterpartyXCP/develop

more misc fixes