fixing issues with the client section [#536]