Fix client script errors

Change-Id: I407040ce02c61daaa4009a168c38aa570159908e