Further fixes to unexpected token message