Fixes to get things building again.