Fixing spurious warnings