- Fixed warning messages