Small fixes + Travis config