Fixed 8 warning messages