Add fixes to the problems pointed out by Dr. Batra.