Minor client changes

Few errors got committed in last commit