Fixes builderrors introduced in previous merge.