Fixes in travis and in tests