Add dropped build-fixing changes.