More latex fixes