WGS84 token fixes

Solves #627 
Type: but the old *one* needs ...