Fix semi-nasty bug
Fix geobugs