Fixed most warning messages