More whoosh fixes.
More whoosh fixes.