Fix some small build errors.