More bugs with swimming resolved