Two small bug fixes
Two small bug fixes

Caught thanks to closure compiler.

NeilFraser/CodeCity,google/CodeCity,NeilFraser/CodeCity,NeilFraser/CodeCity,google/CodeCity,google/CodeCity,google/CodeCity,NeilFraser/CodeCity