travis fix and minor fixes