Fix tex stuf as requested by TODO2