fixed all warning messages