Add/fix some formatting tokens