Further fixes to compile in hudson