Second try at Travis+Cargo fixes