Fix client side prediction issues;