Fix missing token declarations