Changes to patches & removed waiting patches on client side