Few small warnings fixed related to previous changes.