some tweaks to try to make haystack work better