#75 adjust warning messages