Fixes to ensure that it builds without errors.