Fixes to broken build.