WGS84 token fixes

Solves #627 
Fixed in e318540