Fix and suppress a few warnings (bis)