Fix exdir and CRS references