Fix Travis-CI problems