Fix more octal tokens