This fixes a few warnings in other systems. Should have no visible effect in this release.