Fixed errors from travis: 24044966