ITTE-1218 Fixed some client issues. 

Signed-off-by: simeon iliev <simeon.iliev.bg@gmail.com>