Fixed lingering issues with SWC-129.