Changes suggested by changing warning settings