Fixed up minor build errors.