Improved warning visibility

for #1973