Pic related warning enhancement

for #1539