Squash remaining build warnings