some fixes for haystack