Fixup some more compilation issues.