Minor changes to how tokens are referenced