Reduce build warnings