Fix valid token check and path to GF files