Few warnings fixed.