Small build fixes from Tim Mooney.