Fixes as @pah commented at https://github.com/xpol/xchange/commit/0f51f3560fb4865647f7581e576cb8c72d02a493#commitcomment-7569283.