So the PATH trick finally worked. Travis is back on green.

Also some other minor fixes.