fixed the issues related to warnings.