Fix warning messages