Make some corrections so Travis does not fail