Fix some builds