Fixes to parseLocations.

@r3bhatta