Fixed some tokenising issues