More build fixups.