minor fixes as per michael's request
Merge branch 'michael-0921_z' of github.com:zathras-crypto/mastercore into michael-0921_z