WGS84 token fixes

Solves #627