Now builds with this set of changes.