|#1488|+Riya| Minor fixes.