Hide: A slew of swamp bug fixes