Fix signed number issue on server side
Merge in client side signed number fix