- fix warning messages