Merge several enhancements regarding warnings