Minor changes to prevent blocking by GFW