Fix errors on haystack and requirements