Some fixed for nicetex