Minor fixes

If a trade fails, the trade still isn't properly canceled first, and
still takes a while to correct itself. This will be addressed in the
future.