Fixing errors that were causing travis to fail