Fix some quoting issues with Java/TC