Minor corrections to the client prediction