chore: update from client app fixes