Minor KML fixes.
Merge branch 'kml' into uberbranch