Fix some overflow problems in client