Fix tex errors
Merge