Fix build

See r210927 and r210847