SWIM bug fixes