Minor fixes

This series fixes Travis test failure and a minor bug I spotted.

I could have merged it directly but I think it's better to have someone else do it. That's how proper open source project works.