Teresa Tso found some bugs

Change-Id: Ic20aa291ad979fd556f1baa3529887773d5e4b23