Fix whoosh problems