Some tinx changes