Fixes for https://github.com/spoqa/dodo/issues/1324