Fixed an optional, may or may not help with #574.
Fixed Geolyzer+Waila logic.