Re-add changes to packages/client that were left out when pushed to main

Re-add changes to packages/client that were left out when pushed to main #414