[Client] Minor bug fixes