Fix a couple of problems in Travis script