Fixes for travis, I hope.