Swinging fixes