Remove build warnings