Fixed everything needed for travis