Fixed some more errors.
Fixed some more errors.

google/gjstest,okdave/gjstest,aungzanbaw/gjstest,okdave/gjstest,okdave/gjstest,google/gjstest,google/gjstest,google/gjstest,okdave/gjstest,aungzanbaw/gjstest,aungzanbaw/gjstest,aungzanbaw/gjstest