Fixing issues against Travis