Fix client message indexes
Some small fixes