Various fixes for packaging and Haystack 2.0.