Fixes to correct breaking build.