Clean up build warnings