Changes to fix the client spec