Address #681, #694. Update moxiecode/moxie@b346454ac1f55d7bd12e8a49fededf52683c37d3.