Polling join:s plus memory leak fix