Small changes, fix travis