Fix to token separator and sync to LPeU