Added some more stuff to debug Travis failures