Multiple fixes by Nidhi Gupta (Daffodil Software)