Finished clean up of Travis CI errors