Warnings fixed.

Fix Arpit's code.